From: Jeroen van der Heijden Date: Sat, 29 Sep 2018 09:13:42 +0000 (+0200) Subject: pep8 X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~8^2~50 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2aaedcf6ea50679650f75fcf09e3c47c315fdf3b;p=siridb-server.git pep8 --- diff --git a/build_deb.py b/build_deb.py index 00dafcfd..3f05c745 100755 --- a/build_deb.py +++ b/build_deb.py @@ -13,10 +13,12 @@ import argparse VERSION_FILE = 'include/siri/version.h' CHANGELOG_FILE = 'ChangeLog' + def _version_levels(): for n in ('MAJOR', 'MINOR', 'PATCH'): yield re.compile('^#define SIRIDB_VERSION_{} ([0-9]+)$'.format(n)) + def _get_version(): version_gen = _version_levels() version_m = next(version_gen) @@ -35,6 +37,7 @@ def _get_version(): raise ValueError('Cannot find version in {}'.format(VERSION_FILE)) + def _get_changelog(version): with open('ChangeLog-{}'.format(version), 'r') as f: content = f.read() @@ -42,6 +45,7 @@ def _get_changelog(version): raise ValueError('Changelog required!') return content + def _get_distribution(): '''Returns distribution code name. (Ubuntu)''' proc = subprocess.Popen(['lsb_release', '-c'], stdout=subprocess.PIPE) @@ -234,8 +238,9 @@ if __name__ == '__main__': os.chmod(rules_file, os.stat(rules_file).st_mode | stat.S_IEXEC) with open(os.path.join(debian_path, 'links'), 'w') as f: - f.write('/usr/lib/siridb/server/{package} /usr/local/bin/{package}\n'.format( - **config)) + f.write( + '/usr/lib/siridb/server/{package} /usr/local/bin/{package}\n' + .format(**config)) with open(os.path.join(debian_path, 'install'), 'w') as f: f.write('''src/usr / diff --git a/itest/test_insert.py b/itest/test_insert.py index 7956aaa3..cb2f8caa 100644 --- a/itest/test_insert.py +++ b/itest/test_insert.py @@ -40,7 +40,8 @@ class TestInsert(TestBase): result['series'].sort() self.assertEqual( result, - { 'columns': ['name', 'length', 'type', 'start', 'end'], + { + 'columns': ['name', 'length', 'type', 'start', 'end'], 'series': [ [ 'series float',